Permalink
Comparing changes
Open a pull request
- 4 commits
- 7 files changed
- 0 commit comments
- 1 contributor
Unified
Split
Showing
with
14 additions
and 11 deletions.
- +1 −1 MCServer/Plugins/APIDump/APIDesc.lua
- +1 −1 MCServer/Plugins/Core
- +1 −1 lib/libevent
- +1 −1 lib/polarssl
- +3 −0 src/Entities/Entity.h
- +1 −1 src/Entities/Player.h
- +6 −6 src/Protocol/Protocol18x.cpp
| @@ -844,6 +844,7 @@ end</pre> | ||
| IsMinecart = { Params = "", Return = "bool", Notes = "Returns true if the entity represents a {{cMinecart|minecart}}" }, | ||
| IsMob = { Params = "", Return = "bool", Notes = "Returns true if the entity represents any {{cMonster|mob}}." }, | ||
| IsOnFire = { Params = "", Return = "bool", Notes = "Returns true if the entity is on fire" }, | ||
| IsOnGround = { Params = "", Return = "bool", Notes = "Returns true if the entity is on ground (not falling, not jumping, not flying)" }, | ||
| IsPainting = { Params = "", Return = "bool", Notes = "Returns if this entity is a painting." }, | ||
| IsPawn = { Params = "", Return = "bool", Notes = "Returns true if the entity is a {{cPawn}} descendant." }, | ||
| IsPickup = { Params = "", Return = "bool", Notes = "Returns true if the entity represents a {{cPickup|pickup}}." }, | ||
| @@ -1832,7 +1833,6 @@ a_Player:OpenWindow(Window); | ||
| IsGameModeSpectator = { Params = "", Return = "bool", Notes = "Returns true if the player is in the gmSpectator gamemode, or has their gamemode unset and the world is a gmSpectator world." }, | ||
| IsGameModeSurvival = { Params = "", Return = "bool", Notes = "Returns true if the player is in the gmSurvival gamemode, or has their gamemode unset and the world is a gmSurvival world." }, | ||
| IsInBed = { Params = "", Return = "bool", Notes = "Returns true if the player is currently lying in a bed." }, | ||
| IsOnGround = { Params = "", Return = "bool", Notes = "Returns true if the player is on ground (not falling, not jumping, not flying)" }, | ||
| IsSatiated = { Params = "", Return = "bool", Notes = "Returns true if the player is satiated (cannot eat)." }, | ||
| IsVisible = { Params = "", Return = "bool", Notes = "Returns true if the player is visible to other players" }, | ||
| LoadRank = { Params = "", Return = "", Notes = "Reloads the player's rank, message visuals and permissions from the {{cRankManager}}, based on the player's current rank." }, | ||
Submodule Core
updated
from 6e9d61 to b158c0
Submodule libevent
updated
from 62eaa8 to 0b49ae
Submodule polarssl
updated
from 38f47a to d6a153
| @@ -443,6 +443,9 @@ class cEntity | ||
| /** Set the invulnerable ticks from the entity */ | ||
| void SetInvulnerableTicks(int a_InvulnerableTicks) { m_InvulnerableTicks = a_InvulnerableTicks; } | ||
| /** Returns whether the entity is on ground or not */ | ||
| virtual bool IsOnGround(void) const { return m_bOnGround; } | ||
| // tolua_end | ||
| @@ -121,7 +121,7 @@ class cPlayer : | ||
| inline void SetStance( const double a_Stance) { m_Stance = a_Stance; } | ||
| double GetEyeHeight(void) const; // tolua_export | ||
| Vector3d GetEyePosition(void) const; // tolua_export | ||
| inline bool IsOnGround(void) const {return m_bTouchGround; } // tolua_export | ||
| virtual bool IsOnGround(void) const override {return m_bTouchGround; } | ||
| inline double GetStance(void) const { return GetPosY() + 1.62; } // tolua_export // TODO: Proper stance when crouching etc. | ||
| inline cInventory & GetInventory(void) { return m_Inventory; } // tolua_export | ||
| inline const cInventory & GetInventory(void) const { return m_Inventory; } | ||
| @@ -386,7 +386,7 @@ void cProtocol180::SendEntityLook(const cEntity & a_Entity) | ||
| Pkt.WriteVarInt(a_Entity.GetUniqueID()); | ||
| Pkt.WriteByteAngle(a_Entity.GetYaw()); | ||
| Pkt.WriteByteAngle(a_Entity.GetPitch()); | ||
| Pkt.WriteBool(true); // TODO: IsOnGround() on entities | ||
| Pkt.WriteBool(a_Entity.IsOnGround()); | ||
| } | ||
| @@ -429,7 +429,7 @@ void cProtocol180::SendEntityRelMove(const cEntity & a_Entity, char a_RelX, char | ||
| Pkt.WriteByte(a_RelX); | ||
| Pkt.WriteByte(a_RelY); | ||
| Pkt.WriteByte(a_RelZ); | ||
| Pkt.WriteBool(true); // TODO: IsOnGround() on entities | ||
| Pkt.WriteBool(a_Entity.IsOnGround()); | ||
| } | ||
| @@ -447,7 +447,7 @@ void cProtocol180::SendEntityRelMoveLook(const cEntity & a_Entity, char a_RelX, | ||
| Pkt.WriteByte(a_RelZ); | ||
| Pkt.WriteByteAngle(a_Entity.GetYaw()); | ||
| Pkt.WriteByteAngle(a_Entity.GetPitch()); | ||
| Pkt.WriteBool(true); // TODO: IsOnGround() on entities | ||
| Pkt.WriteBool(a_Entity.IsOnGround()); | ||
| } | ||
| @@ -947,7 +947,7 @@ void cProtocol180::SendPlayerMoveLook(void) | ||
| Pkt.WriteDouble(Player->GetPosX()); | ||
| // The "+ 0.001" is there because otherwise the player falls through the block they were standing on. | ||
| Pkt.WriteDouble(Player->GetStance() + 0.001); | ||
| Pkt.WriteDouble(Player->GetPosY() + 0.001); | ||
| Pkt.WriteDouble(Player->GetPosZ()); | ||
| Pkt.WriteFloat((float)Player->GetYaw()); | ||
| @@ -976,7 +976,7 @@ void cProtocol180::SendPlayerSpawn(const cPlayer & a_Player) | ||
| Pkt.WriteVarInt(a_Player.GetUniqueID()); | ||
| Pkt.WriteUUID(cMojangAPI::MakeUUIDShort(a_Player.GetUUID())); | ||
| Pkt.WriteFPInt(a_Player.GetPosX()); | ||
| Pkt.WriteFPInt(a_Player.GetPosY()); | ||
| Pkt.WriteFPInt(a_Player.GetPosY() + 0.001); // The "+ 0.001" is there because otherwise the player falls through the block they were standing on. | ||
| Pkt.WriteFPInt(a_Player.GetPosZ()); | ||
| Pkt.WriteByteAngle(a_Player.GetYaw()); | ||
| Pkt.WriteByteAngle(a_Player.GetPitch()); | ||
| @@ -1305,7 +1305,7 @@ void cProtocol180::SendTeleportEntity(const cEntity & a_Entity) | ||
| Pkt.WriteFPInt(a_Entity.GetPosZ()); | ||
| Pkt.WriteByteAngle(a_Entity.GetYaw()); | ||
| Pkt.WriteByteAngle(a_Entity.GetPitch()); | ||
| Pkt.WriteBool(true); // TODO: IsOnGrond() on entities | ||
| Pkt.WriteBool(a_Entity.IsOnGround()); | ||
| } | ||